From 21aef5b77fa89a0c62cb72ce16ee579d3aaec624 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 29 Dec 2010 16:26:05 +0900 Subject: [PATCH] Fixed generic height-for-width implementation of GtkBin to consider request adjustments Since "->adjust_size_request()" was added, it became important for GtkBin's generic height-for-width implementation to further check the requests using this vfunc. --- gtk/gtkbin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index 2e2cde65d1..af3efea253 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -211,7 +211,12 @@ get_child_padding_delta (GtkBin *bin, * direct vfuncs */ GTK_WIDGET_GET_CLASS (bin)->get_preferred_width (GTK_WIDGET (bin), &hmin, &hnat); + GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), + GTK_ORIENTATION_HORIZONTAL, &hmin, &hnat); + GTK_WIDGET_GET_CLASS (bin)->get_preferred_height (GTK_WIDGET (bin), &vmin, &vnat); + GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), + GTK_ORIENTATION_VERTICAL, &vmin, &vnat); gtk_widget_get_preferred_width (priv->child, &child_hmin, NULL); gtk_widget_get_preferred_height (priv->child, &child_vmin, NULL); -- 2.30.2